Merge pull request #21 from fusion94/master

oops