small fixes
Merge branch 'master' of http://git2.niven.cn/ccplus
Merge branch 'master' of http://git2.niven.cn/ccplus