Marc's first commit

Marc added his name to file
merged version of Beat and Marc

Beat's and Marc's comments merged in the text
Merge pull request #3 from marcwolf/master

Beat's and Marc's merged comments