Minor changes
Merge pull request #26 from nmpeterson/master

Minor changes