Re-written from scratch. New class
Merge https://github.com/simon-eq/imageuploader