Fix grammar and formatting
Merge branch 'master' into debian