Feature/412 address verification

Addresses #519 and #518.