Still a work in progress :(
Merge branch 'master' of https://github.com/FrancisBaileyH/Uploadr