multiple files support, scaling factor
Merge branch 'master' of https://github.com/samoylv/FELsource