bumped to version 3.3.0
Merge branch 'develop'