fix ordering of fields
Merge pull request #2 from rjnienaber/fix_order

fix ordering of fields