Added --keep-lonlat option