Some suggested changes
Merge pull request #2 from timhunt/temp

Some suggested changes