update style
Merge branch 'dev' into beta