CS fixes
Merge pull request #3 from spiasecki/cs-fixes

CS fixes