closes #23
Merge pull request #70 from KelseyLMay/AustinTueNi

closes #23