Update and merge new def
Merge branch 'master' of https://github.com/ecryan/website