Various Improvements
Merge branch 'master' of https://github.com/kangarko/Spigot-Server