wangyaoxuan:new branch

Please merge from this branch into your master branch in GitForBeginners.