Fix 375

Update style
Merge branch 'hotfix/375' into develop