Update CREDITS

Filled my placeholder
Merge pull request #116 from hakre/patch-3

Update CREDITS
Merge branch 'master' into 3.x