closes #14
Merge pull request #37 from KelseyLMay/branch14

closes #14