Bug fixes.
Merge branch 'master' of https://github.com/chearner/cmt