Issue # 185 - Add avatar