closes #90
Merge pull request #95 from KelseyLMay/branch90

closes #90