debugging stuff (require bust) deleted
Merge branch 'hotfix-1.2.1'