Minor updates
Merge pull request #8 from ruddfawcett/pr/7

Minor updates