Merge pull request #29 from TimmyLiu/develop

Develop