new version of the simulator
Merge pull request #6 from adamreis/adam

new version of the simulator