Merge pull request #1 from Hriedmarr/master

merge
Merge pull request #4 from ihatejakeeason/master

asdf