For real. this time
Merge branch 'master' of github.com:srrvnn/stop