Merge branch 'master' into Kaibo's-Brancherinos
fixed backwards stuff
Merge branch 'Kaibo's-Brancherinos'