S09221640
Merge pull request #81 from JammingLin/master

From-avi 09221641
S09221715
Merge pull request #61 from SuperMeat/master

To-avi 09221716