Merge pull request #1 from isao/develop

rename pkg & repo w/ "cli", misc
Merge remote-tracking branch 'up/master'