add stop
refactor
Merge pull request #4 from renrenfed/master

pull from renrenfed