Added address validation.
Merge branch 'verify_address'