Merge pull request #3 from hohonu/develop

Pulling develop into master
Merge branch 'master' of github.com:hohonu/umshiang into develop