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

Fixed CS