Merge pull request #12 from MySmallfish/master

1.0.23
Merge pull request #15 from michaelblayfer/master

Merge pull request #12 from MySmallfish/master