PSR2 fixes, update version