Continued boss behaviour (kewl effekts now!)
Merge remote-tracking branch 'origin/master'