Allison and Tim's submission
Merge pull request #25 from timproctor/patch-1

Allison and Tim's submission