Added cli.py command line interface
Added comments
Merge branch 'develop' into develop-mators11