Add more options for name interpolation
Merge pull request #143 from jamespjh/name_interpolation

Add more options for custom file name generation