Merge pull request #4 from Youthink/master

第二次提交
算是最后一次
Merge pull request #1 from ruitian/master

2014-12-27 fork