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

Cs fixes