added get/set for the values needd for the query in SimulationSettings
Merge remote-tracking branch 'origin/master'