initial changes to Simulator, methods
Merge pull request #24 from rbrueckner93/Ruben18051

initial changes to Simulator, methods