changed the parsing of the address coming in
Merge branch 'Denis' into sdunks
fixed the address return thing