pull request from 曹煜泽#10

lingcraft wants to merge 7 commits intocqucontinue:mastercqucontinue/2015-third-round:masterfrom

lingcraft:masterlingcraft/2015-third-round:masterCopy head branch name to clipboard