Fixed in comment
Fixes for mapping fetch fields
Merge pull request #788 from nabinhait/hotfix

Minor fixes in comment and mapper