refactored
Merge branch 'master' of github.com:snowch/stratos-cli-test