Merge pull request #213 from ChaoPang/master

Backported this bug fix to the mavenized repository