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