Merge pull request #11 from MySmallfish/master

1.0.22
Merge pull request #14 from michaelblayfer/master

Merge pull request #11 from MySmallfish/master