Test to demonstrate bug #578.
Merge pull request #579 from NicoleRauch/master

Test to demonstrate bug #578.
Merge pull request #577 from leider/master

several minor tweaks