Updated with latest from master, added geocoders