Upload fixes
Merge branch 'master' of https://github.com/HenkMollema/orangefever.git