Editing author info
Merge pull request #1 from xcoulon/topic_branch

Editing author info