fixed master-name and a test setup problem as suggested by: Peter Kullmann <p.kullmann@arenae.ch> fixed line endings