Fixes #312
Merge pull request #352 from MastodonC/feature/better-address-information

Fixes #312