Merge pull request #97 from nabinhait/master

mapper