Merge pull request #6 from RenWenshan/master

Fixes #5