fix CS and headers
minor #31 fix CS and headers (sstok)

This PR was merged into the master branch.

Discussion
----------

Commits
-------

d71d91c83f3de8ee5238362234fa14b9746ef899 fix CS and headers