Merge tag '0.4.13' into develop

Released-0.4.13 0.4.13
added parameter for the user upload directory
bumped version
Merge branch 'release/0.4.14'