Closes #122
Merge branch 'enhancement-#122' into hotfix-1