P2&3.
Merge branch 'master' of https://github.com/LordPisty/S99