mod. update authors
Merge branch 'working'