More stuff
Merge branch 'NewMaster' of https://github.com/TeamInversion/Inversion into NewMaster