Merge pull request #107 from YaroslavLitvinov/issue102_103

fixed issues #102, #103
fixed issue #103 - verify mapping and permissions