Authors
Merge master