Ensure that extra_fields are set before processing
Better processing of plugins data
Merge pull request #3 from betweenbrain/develop

Merge Develop