cahnges
Hotfix finished
Merge branch 'hotfix/Bugs'