31dea3844e
Revert "Revert "Merge pull request #101 from chao-mu/master""
[See #101]
This reverts commit c5ce575543.