Update authors to something more accurate
Merge branch 'master' into authors