Merge pull request #1 from MakeItEasy/master

sync from makeiteasy
Merge pull request #2 from MakeItEasy/master

modified by makeiteasy 2.
test for pull request
test for pull request 2
Merge pull request #3 from wennylover/master

测试一下pull request是否可以只merge需要的
貌似不可以