refactor cli a bit
bump version
Added tag 0.4 for changeset dacadb41e5c3