Fix it up
Merge pull request #95 from stuntguy3000/master

Fix it up