Update my copy

Merge all the author changes.