Continuation of #15
Merge branch 'hotfix/#15' into develop