Merge pull request #102 from gnott/tweaks

Tweaks