Revert "Revert "Merge pull request #783 from JohannesPfeifer/simul_messages""

This reverts commit edc312eb705c3b47ee1a377161bb1571c2a5049b.