Merge pull request #28 from zhuchenwang/develop

Issue #27
Fixed a tiny typo
Merge pull request #30 from sslavic/patch-1

Fixed a tiny typo
Merge pull request #2 from xerial/develop

Rebase