Merge pull request #7 from huntwelch/master

merge
Hyphendotsenshpiel
Merge pull request #71 from elliottcarlson/master

Hyphendotsenshpiel