CLI implementation
Merge pull request #171 from tssajo/upstream

CLI implementation