Patch from Thierry el Borgi with some rework of myself. NOTE: I don't have much file to test, so if some don't contact us with those file and we will fix the loader if needed. SVN revision: 58873