Support for badges
PSR2 fixes