Merge pull request #263 from mdijkstra/master

Environment in separate files
Implemented runid.