Merge pull request #18 from limianwang/master

Revert PR#13
- Update version number
Merge remote-tracking branch 'upstream/master'