Merge pull request #27 from TimBB/master

Fix for Issue #25