Merge branch 'hotfix/0.9.0.1' into develop
Removed teh traps
Merge branch 'develop'