update from master
Merge branch 'master' of https://github.com/Appsbender/croogo