Merge pull request #65 from SuperMeat/master

To-avi 09231454
1.0.0 09231500
1.0.0 092810.53
Merge pull request #85 from JammingLin/master

From-avi 09281101