Config and validation fixes
Merge pull request #16 from DDS32/custom-fields

Config and validation fixes