fixes #57
Merge pull request #692 from magfest/conditional_shift_step

fixes #57