Changed filename output format for strain_* files
Merge remote-tracking branch 'upstream/master'