Merge pull request #1 from juberti/gh-pages

Merge changes to master
Restore text and credits
Merge branch 'master' into gh-pages