Fix more stupid problems
Merge pull request #39 from CoderBaconApp/stupid-problems

Fix more stupid problems