Merge branch 'hotfix/1.1.4'
Merge branch 'master' into develop
tests passing, throw 3 exceptions depending on the situation