Merge pull request #8 from MySmallfish/master

1.0.18
Merge pull request #9 from michaelblayfer/master

Merge pull request #8 from MySmallfish/master