PSR-2 fixes and updated readme