CS fixes
Merge pull request #26 from sagikazarmark/master

CS fixes