Data mapper was adapted
Merge pull request #4 from Tozkoparan/master

Data Mapper was adapted