Merge pull request #15 from MySmallfish/master

1.0.47
Merge pull request #18 from michaelblayfer/master

Merge pull request #15 from MySmallfish/master