Merge pull request #4 from jordandukart/7.x

Map the keys correctly.
Merge pull request #5 from jordandukart/7.x

Instansiate an empty array so it's referenced correctly.
Trim out the empty fields so we don't get extra whitespace.