Merge pull request #49 from fehmicansaglam/master

Refactor Mapping DSL