Closes #142
Closes #137
Merge branch 'bugfix-#142' into hotfix-4
Merge branch 'bugfix-#137' into hotfix-4
Merge branch 'hotfix-4' into unit-testing