Possible bug fix for stopping problem
Merge pull request #1 from koalo/master

Bugfix for stopping problem?