Merge branch 'master' of github.com:yuxiaopeng/yuxiaopeng.github.com into source