Merge pull request #11 from MySmallfish/master

1.0.22