S10271551
Merge pull request #88 from JammingLin/master

From-avi 10271552
Merge pull request #70 from SuperMeat/master

To-arvi 10241554