Merge pull request #64 from SuperMeat/master

To-avi 09231217
1.0.0 09231217
Merge pull request #84 from JammingLin/master

From-avi 09231453