Feature/24 avatar lookup

This pull request will only partially fix #24, but I think this is a good enough improvement to be merged into master.