dane-kleiner Merge pull request #765 from ratt-ru/sofia_update