Merge pull request #10 from MySmallfish/master

1.0.21