UPD: UserIdentity rewrite to PSR
Merge pull request #638 from angel-kulikov/master

UPD: UserIdentity rewrite to PSR