Merge pull request #13 from MySmallfish/master

1.0.38