commit 3

third commit from zeithes