Merge pull request #6 from MySmallfish/master

1.0.16