Implement new parameter to allow customisation of the output filename convention. Fixes #11