More fixes
Fix typo
Merge pull request #35 from chen3feng/develop

Develop