Merge pull request #13 from JammingLin/master

01171627
01171628 toArvi
Merge pull request #7 from SuperMeat/master

01171628 toArvi