cs fixes
Merge branch 'master' of github.com:anyx/marion