Allow to add extra fields
Merge pull request #404 from holtkamp/patch-2

Allow to add extra fields