Added authors name in alphabetical order
Merge origin/master