try to make a better hook
Merge branch 'master' into gh-pages