Closes #125
Merge branch 'enhancement-#125' into hotfix-2
Closes #130
Merge branch 'bugfix-#130' into hotfix-2
Closes #132
Merge branch 'bugfix-#132' into hotfix-2
Merge branch 'hotfix-2' into develop