Merge branch 'bug/ZEST-107' into develop

Closes #2 Github Pull-Request