Fixed #100: Mapping of Address for a Facility
Merge branch 'feature/100-facility-map'