refactoring
Merge branch 'distributed-testrunner' of https://github.com/kmrz/Simulator into distributed-testrunner