Better filename generation
Better filename generation
Better filename generation
Merge pull request #135 from guidovranken/master

Better filename generation. Closes #131.