Merge pull request #15 from inspiran/master

Add xml based mapping