cs fixes
Merge pull request #3 from prisis/master

cs fixes