Merge pull request #12 from MySmallfish/master

1.0.23