updates
Merge branch 'master' of github.com:dokamura/ccm_dev