S09281100
Merge pull request #85 from JammingLin/master

From-avi 09281101
S09281121
Merge pull request #66 from SuperMeat/master

To-avi 09281122