Revert "Revert 1 master"
Merge pull request #4 from lieyingfive/revert-3-revert-1-master

Revert "Revert 1 master"