CLI updated
Merge pull request #47 from MilloLab/master

Merge master to 0.8
Merge pull request #48 from MilloLab/0.8

0.8