Merge branch 'devel'
Added missing style
Merge branch 'master' into devel