update spec
Merge branch 'dev'