added address parsing regex method
Merged
Fixed merge