FIX Issue #6

Fixing hard coded field names
Merge pull request #7 from Mark-M/patch-1

FIX Issue #6