The commit to merge them all
Merge pull request #32 from pasibun/Fixing_the_simulation_class

The commit to merge them all