closes #5
oops
Merge pull request #11 from jessehattabaugh/dev

FIxed #5