Minor tweaks
Merge pull request #9 from nmpeterson/master

Minor tweaks