Fixed rotation and reset; may fix issue #30
Fixed rotation and reset

May resolve issue #30