Fixes suggested by PR review - thanks chaps..
Merge pull request #19 from ewels/master

Fixes suggested by PR review - thanks chaps..