Added number and email #42
Fix #41
Fix #40