This should be the last thing...

Merge it and we should be ok.
Merge pull request #1 from TheVikingWarrior/patch-17

This should be the last thing...