Some refactor
Merge branch 'master' of https://github.com/teambox/viper-module-generator