Merge pull request #5 from catsplayingmahjong/develop

Version 0.3
Merge pull request #6 from catsplayingmahjong/master

Merge Version 0.3 from master