Merge pull request #1 from catsplayingmahjong/develop

Version 0.1
Merge pull request #2 from catsplayingmahjong/master

Merge pull request #1 from catsplayingmahjong/develop