Merge pull request #1 from madre/master

2014-11-21 pullrequest
Merge pull request #2 from madre/master

从原作者获取最新代码
Merge pull request #1 from dqsdhr/master

Merge pull request #1 from madre/master