Simplify the authors section
Merge branch 'master' into authors
Merge pull request #441 from alex/authors

Simplify the authors section