S09231214
Merge pull request #83 from JammingLin/master

From-avi 09231216
Merge pull request #64 from SuperMeat/master

To-avi 09231217