Merge pull request #26 from Zhang/develop

Develop
committing