pysim.git branch pmaier/sim updated. 5b115f2e79095f437d784142cfcdc68c7689deb3