mapping issues fixes and deprecated functions removing
Merge pull request #1 from molchanoviv/fix

mapping issues fixes and deprecated functions removing