Merge branch 'hotfix/0.0.0.5'
removing debug code
Merge branch 'hotfix/0.0.0.6' into develop