cs-fix
Merge pull request #286 from UFOMelkor/cs-fixes

cs-fix