Merge pull request #28 from d3zd3z/sim

Sim updates