Merge pull request #32 from poupotte/master

Debug error message in stop function
1.1.17
Merge remote-tracking branch 'upstream/master'