fixed the author name
Merge branch 'master' into ubuntu
fixes