clean up + adding 5sec timeout
merging
Merge branch 'master' of github.com:onstutorial/onstutorial