imporve addresses and use onlyAddresses
Merge pull request #1 from fanatid/master

imporve addresses and use onlyAddresses