Generalized it to work with any conversion type
Added ability to include lat/lon