Add my email to CREDITS file
Merge branch 'hotfix/credits'