Merge branch 'release/0.3.0' into develop
made the upload object less complicated
bumped version number to 0.3.1
Merge branch 'release/0.3.1'