Fixed coding style
Merge branch 'release' into development