Merge pull request #53 from inspiran/master

Refactored setup command
Refactoring to use less bundles