Merge pull request #78 from JammingLin/master

From-avi 09191529
Merge pull request #58 from SuperMeat/master

Merge pull request #78 from JammingLin/master