updated comments
Merge branch 'feature'
Merge branch 'master' of https://github.com/dope/starter