check in.
fixed typo
Merge origin/master
Modified authors entry.