Merge pull request #82 from stuntguy3000/master

Fix mistakes from #81 (Im looking at you, JOPHESTUS)
Consistency at its finest
Make JOPH happy
I contributed!