1.0.z
Merge branch 'master' of https://github.com/oldwang/2014_CCSP_Final