[TASK] small bugfixes for CLI
Merge branch 'master' of github.com:AValnar/Bonefish
Merge "Update README.md"
Merge branch 'master' of ssh://gerrit.killergurken.de:29418/Bonefish