changed "author:" to "@author"
Merge remote-tracking branch 'origin/master'