fixed typo in credits;
Merge branch 'master' into gh-pages