mudando de fromUser para author
Merge branch 'master' into release