Merge pull request #6 from MySmallfish/master

1.0.14
Merge pull request #7 from michaelblayfer/master

Merge pull request #6 from MySmallfish/master