Dynamic filearea, filename taken from original file and some more corrections
Merge pull request #4 from crazyserver/wip-MDL-35434_m2

Dynamic filearea, filename taken from original file and some more corrections