Refactoring CLI commands and adding -p option to subscribe command which was overwritten in previous commit
Merge remote-tracking branch 'origin/master'