FINALLY FIXED THAT FUCKING STUPID CONTROLLER BUG IT WAS SO DUMMMMMMMB
Merge pull request #386 from jessevondoom/master

FINALLY FIXED THAT FUCKING STUPID CONTROLLER BUG IT WAS SO DUMMMMMMMB