Merge pull request #16 from simonpasquier/add-extra-fields

Templatize extra_fields.lua file