Merge branch 'jc/author-nickname'