Fix for #29; instant snap back when looping: false

Based on the suggestions in #29, I have removed `dist = 0` around line 373 which seems to have been used in the `if` statement later on. Instead, I have assigned the condition to a variable and have OR'ed that with the original condition.

This *seems* to work for me but I would *love* additional feedback from the original participants in the issue report (@ghost, @MathieuLoutre and @linlex).