Merge pull request #7 from MySmallfish/master

1.0.16
Merge pull request #8 from michaelblayfer/master

Merge pull request #7 from MySmallfish/master