Bug fix
Merge pull request #62 from someguy9/master

Bug fix