Updated editor settings
Merge branch 'hotfix/0.0.7'