A bad attempt to support MCPC+. It doesn't work at the moment due to MCPC+ being difficult aka Bitch.
Merge remote-tracking branch 'origin/master'