Enhance address management
Merge pull request #1025 from loiccouturier/master

Enhance address management