quick bug fix
nevermind!
Merge branch 'release/1.0'
removed bug file
Merge branch 'hotfix/1.0' into develop