Merge pull request #1379 from mmicko/sim_models