Merge pull request #25 from JammingLin/master

1.0.0 03040906
03040926
Merge pull request #13 from SuperMeat/master

03040927 to Arvi