pysim.git branch pmaier/sim updated. 530b90ed9ff9a96eb3b99d92703a272eb1ca1507