Corrected bug in output file name parsing
Merge branch 'master' into issue43_refactor