closes #60
Merge pull request #67 from KelseyLMay/branch60

closes #60