Merge pull request #8 from MySmallfish/master

1.0.18