Issue #551 fixed
Merge pull request #552 from Bohdan-Tereta/test

Issue #551 fixed