Some fixes
Merge branch 'master' of https://github.com/cloudmodel/cloudmodel