Max stuff
Merge branch 'master' of https://github.com/GiantSteps/MC-Sonaar