adjusted registration to new spec
Merge branch 'master' into gh-pages