Fix for bugzid 3833
Merge pull request #84 from maksimov/develop

Fix for bugzid 3833