pysim.git branch pmaier/sim updated. 60c093fec9711a7c0fc3ba0d78e2d9853b1012bf