Added karlmoritz's rectangular avatars support.