something something
Merge pull request #1 from franhp/some_sim_tests

something something