Updates updates updates ;-)
Merge branch 'author_cpfaff'