add register
Merge branch 'dev'