closes #84
Merge pull request #93 from KelseyLMay/branch84

closes #84