Fix #3 and Fix #4. Added url and e-mail fields.