Credit
Adding
GOne
Merge branch 'master' into gh-pages