Added our own upload handler and formatted code
Merge remote-tracking branch 'origin/dev' into dev