redo add phone number (fixes #65)
redo fixes issue #66
Merge remote-tracking branch 'origin/issue65redo' into issue65
Merge remote-tracking branch 'origin/issue66redo' into issue66