Code Cleanup #19
Code Cleanup #19
Configuration of default field names #20