I cannot stand that code... (Will uncomment for release)
fix formatting
Merge remote-tracking branch 'origin/master' into drtshock