Improved compatibility with previous way of writing input files
Merge branch 'nifhleim'