Fixed CS
Merge pull request #50 from pborreli/fixed-cs

Fixed CS