Issue # 459 fix. Test should be made
Issues #459 and #500 fixed
Issue #502 fixed
merge with development
Merge pull request #501 from Bohdan-Tereta/development

Issues #459 , #500, #502 fixed