Revert "pull from tony"
Merge pull request #2 from snailflying/revert-1-master

Revert "pull from tony"