fix hang
Merge branch 'master' of github.com:kevinchandler/Steppr