Merge branch 'hotfix/bug130'
Merge branch 'master' into develop