closes #82
Merge pull request #86 from KelseyLMay/branch82

closes #82