Merge tag 'release/v0.2.1' into development

Release v0.2.1

* tag 'release/v0.2.1':
Improve address matching
Merge branch 'release/v0.2.2'

* release/v0.2.2:
  Improve address matching