Revert "Fixes for errors posted on facepunch"
Merge pull request #32 from Tommy228/revert-18-master

Revert "Fixes for errors posted on facepunch"