Merge pull request #60 from SuperMeat/master

To-avi 09221545
1.0.0 09221626
Merge pull request #81 from JammingLin/master

From-avi 09221641