Issue #480 fixed
Merge pull request #482 from Bohdan-Tereta/test

Issue #480 fixed