Minor tweaks
Merge pull request #58 from sli-fox/steph_branch

Minor tweaks