Minor tweaks
Merge pull request #37 from nolanfilter/Nolan

Minor tweaks