fix style
Merge branch 'devel'