Mapping and encoding improvements

This release adds mapping of specific columns and allows a custom encoding to be specified for the input file.