Issue #605 fixed
Issues #604 and #605 fixed
Merge pull request #606 from Bohdan-Tereta/development

Issues #604 and #605 fixed