changed authoted names
Merge branch 'development'