Merge branch 'release/v0.4.21' into develop
bug fixes
basic file uploads, some work towards #14
Merge branch 'release/v0.4.22'