bugfixes CLI
Merge pull request #33 from zimmerst/pre-v1r1p4

bugfixes CLI