Add CLI
Minor improvements
0.1.2