Mapping fixes
Merge pull request #3 from molchanoviv/fix

Mapping fixes