UPD: #1225 for UserModule + small PSR and somes fixes
UPD: #1225 for UserModule + small PSR and somes fixes