Merge pull request #10 from MySmallfish/master

1.0.21
Merge pull request #13 from michaelblayfer/master

Merge pull request #10 from MySmallfish/master