Added response field names and small fixes
Merge pull request #314 from c4xp/master

Added response field names