Edited IO interface and RunSimulation
Merge origin/master