Merge pull request #5 from SuperMeat/master

01171042 to-Arvi
Merge pull request #10 from JammingLin/master

Merge pull request #5 from SuperMeat/master