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