update credits
Merge branch 'credits'