Merge pull request #96 from nabinhait/master

mapper