Bumped version to 0.3.3
Various improvements
Merge branch 'hotfix/change_import' into develop