Merge pull request #99 from C4K3/show-addresses-option