Added geocoding, merged branches