new constrcutor for configuring own mapper class
slight tweaks
Merge branch 'pull-request-546'
manually merge in changes from #540