Merging #2256
CodeStyle
Merge pull request #2804 from Bakual/CodeStyle

Fix CodeStyle Issue with latest commit