Merge pull request #13 from SuperMeat/master

03040927 to Arvi
1.0.0 03040933
Merge pull request #26 from JammingLin/master

1.0.0 03040937