Fetched Simulator class from develop branch, #554
Fetched ControlSimulator from develop branch, #554