Changed naming of intermediate formats to not interfere with one another
Merge pull request #30 from nilsbore/master

Changed naming of intermediate formats to not interfere with one another. Good fix.