Merge pull request #788 from nabinhait/hotfix

Minor fixes in comment and mapper
[fix] double insert
[fix] double insert
Minor fix in mapper