Merge pull request #1 from skranz/master

Pullrequest for me
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
simple grammar corrections
Merge pull request #2 from MartinKies/master

some small corrections