bugfix2
Merge branch 'hotfix/Bug2'