S09171144
Merge pull request #75 from JammingLin/master

From-avi 09171422
Merge pull request #54 from SuperMeat/master

To-avi 09171425