S09221539
Merge pull request #80 from JammingLin/master

From-avi 09221544
Merge pull request #60 from SuperMeat/master

To-avi 09221545