Merge pull request #553 from ozbenh/sim-autoinit