S09181543
S09181636
Merge pull request #76 from JammingLin/master

From-avi 09181641
Merge pull request #56 from SuperMeat/master

To-avi 09181642