pysim.git branch pmaier/sim updated. 7ab01eb621557406703002b4f66130b5c7e1e4ff