Fixed BUG_4
Merge pull request #48 from ssirushchyshyn/develop

Fix for BUG_4