Merge "Fix author information"