Fixing spelling errors
Merge branch 'master' into debian