updated some stuff
Merge branch 'release/0.3.3'