Closes #1056 and #1057
Merge pull request #1058 from spumko/issue/1056

Closes #1056 and #1057