fix style
Merge branch 'chromaway-master'