Fixed trailing whitespaces + typos
Merge pull request #2 from matthias-guenther/corrections

Fixed trailing whitespaces + typos