CS fix
merged branch peterkokot/patch-1 (PR #376)

This PR was squashed before being merged into the master branch (closes #376).

Discussion
----------

CS fix

Commits
-------

abd9c8b CS fix