Merge branch 'release/0.8.4' into develop
intellij update some settings
fix issue #30 (found after first fix)
update changelog
Merge branch 'release/0.8.5'