S09231451
Merge pull request #84 from JammingLin/master

From-avi 09231453
Merge pull request #65 from SuperMeat/master

To-avi 09231454