Merge of pull request from thulas/simx (master) to sim-x/simx (master)