fixed
Merge branch 'master' of https://github.com/sp90/boilerplate
improved scripts