Author information added.
Merge origin/master