Merge pull request #50 from dereuromark/master

cs fixes
coding standards