Merge pull request #17 from DrMarcII/master

Fixes suggested by reviewers.