Added avatar support (closes #4)