PR from Shift: #91
PR from Shift: #91