Closes #125
Merge branch 'enhancement-#125' into hotfix-2