Fixing some minor problems & add the module dependencies
Update dependencies & cleanup
Merge branch 'master' of github.com:colin-bellino/gregoire