Changes needed to load data correctly
Merge pull request #354 from vertigo7x/field_group

Changes needed to load data correctly and naming of the fields name. Thanks @vertigo7x and @cyberwani.