fixed issue #103 - verify mapping and permissions
Merge pull request #108 from YaroslavLitvinov/issue102_103

fixed issue #103 - verify mapping and permissions