Cs fixes
Merge pull request #2 from Oefenweb/cs-fixes

Cs fixes