update
Merge branch 'simple_style' into development
update_simple_style