Added support for explicit mapping of source properties
Merge branch 'gh43'