Implementando Author
Merge origin/master