Improve regex (mostly on assumption, rather than evidence...)
Improve regex (mostly on assumption, rather than evidence...)

david-r-edgar/google-maps-data-parameter-parser,david-r-edgar/google-maps-data-parameter-parser