Merge branch 'feature/author'