Merge pull request #9 from MySmallfish/master

1.0.21