Merge branch 'misc'
Merge branch 'master' of https://github.com/guozengxin/guozengxin.github.com