Merge branch 'hotfix/#31'