Simulation class updated.
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from cefarix/master

From Moutaz