Manual merge of pull request #424. https://github.com/ivansafrin/Polycode/pull/424