Removing the shit
Merge branch 'hotfix/1.01.01'