Fixes #54
Merge pull request #55 from therealjessesanford/master

Fixes #54