Merge pull request #10 from shpung/develop

Develop