Added the custom filename feature (see #6)
Merge branch 'feature/custom-filename' into develop