Fixed #15 and bug with avatar images