HotFix
Merge branch 'hotfix/1.0.1'
Merge tag '1.0.1' into develop

Fixed Bugg