Add custom avatar support

Closes #23