Bumped version to release
Lint fixes
Merge branch 'release/0.4.0' into develop
Bumped version to SNAPSHOT