Merge pull request #61 from JammingLin/master

1.0.0 08071805