Multiple authors implementation for #956