Merge pull request #1 from dwkitchen/master

Bring address field up to date with addressing