Merge branch 'master' into develop
Release 0.3.3.
Minor updates.