Fixes #399 : Limit addresses list
Merge pull request #456 from cmgustavo/feature/01-limit-addresses

Fixes #399 : Limit addresses list