closes #29
Merge pull request #30 from KelseyLMay/branch29

closes #29