Feature/412 address verification

Fixes #523 and #535.