Merge pull request #6 from joola/release/3.0.4

Release/3.0.4
Merge branch 'release/3.1'
Merge pull request #8 from joola/develop

Support files update
Merge branch 'master' into develop