closes #4
Merge pull request #33 from KelseyLMay/branch4

closes #4