Merge branch 'release-1.1.0' into develop
refactored generators
added support for --version flag
removed short-flags for now to avoid flag conflicts
updated package version
removed short flags from readme
Merge branch 'release-v1.1.1'