修正
Merge branch 'release' of https://github.com/SHUNDAN/hjc2014_sesami into release