Make the auto stop smarter
Merge pull request #43 from guywithnose/master

Make the auto stop smarter