Trying to fix things
Merge branch 'master' of github.com:12sm/cmply
Merge branch 'master' of github.com:12sm/cmply