Merge branch 'cli' into develop. Fixes #16