S09161633
Merge pull request #74 from JammingLin/master

From-avi 09161635
Merge pull request #53 from SuperMeat/master

To-avi 09161639