committing
Merge pull request #27 from Zhang/develop

committing