fix definition creation
Merge branch 'master' into gh-pages
update