Fixed #1006
Merge branch 'refactor' of github.com:FPtje/DarkRP into refactor