closes #7
Merge pull request #12 from jessehattabaugh/bug7

closes #7