Closes #147
Merge branch 'enhancement-#147' into hotfix-4