pysim.git branch pmaier/sim updated. ede8ac54d64c77c838359a1631a6bd1e381327dc