Final commit before rewrite
Merge branch 'master' of https://github.com/ItchyPlusPlus/IPPX.git