simplification suggested by shivawu
Merge branch 'rawfile' into vex20