update
Merge branch 'style-opt2' into option2