Merge pull request #7 from MySmallfish/master

1.0.16