Merge pull request #1 from memect/master

sync
Merge pull request #36 from baojie/master

Merge pull request #1 from memect/master