Merge branch 'release-0.3.3' into development
Updated the changelog
Merge branch 'development'