Fixed CS
Merge pull request #1672 from deguif/master

Fixed CS