Use macros from addresses.h
Merge pull request #378 from adrian17/addresses

Use macros from addresses.h