Final
Merge pull request #1 from SimulationAndModels/master

combine the two