unlocked mode stops and starts but doesn't pause
Merge branch 'master' of https://github.com/talkingstick/repo