updated registration
Merge branch 'master' into derek
update