Changed address lookup.
Merge pull request #21 from allenh1/master

Changed the search for address method.