a final commit
Merge pull request #45 from chenjiayuan/jchen

a final commit
Merge pull request #46 from chenjiayuan/develop

Develop