refact
new features
Merge pull request #9 from dianping/develop

Develop
merge
Merge pull request #10 from dianping/develop

Develop
Merge pull request #82 from sunryuan/master

fix bugs