updating in progress
Merge pull request #34 from Zhang/develop

updating in progress