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