update
Merge branch 'master' of github.com:tamihiro/cm_demo