Merge pull request #29 from nilsbore/master

Made some changes to make sure it works with long_term_patroller_with_logging. Needed for said code to work.
Changed naming of intermediate formats to not interfere with one another