Trying to fix most of the errors tterrag made
Merge pull request #103 from alexbegt/1.7.x

Trying to fix most of the errors tterrag made