closes #17 and #7
Merge pull request #46 from KelseyLMay/branch17

closes #17 and #7