Added support for address
changed the line
merged the branches