Merge pull request #27 from TimBB/master

Fix for Issue #25
Merge pull request #10 from BasisHub/master

Merge pull request #27 from TimBB/master