Replace cli() decorator; minor PEP8 fix
Merge pull request #9 from seils/master

Replace cli() decorator; minor PEP8 fix