Merge branch 'pr/368'

Fixes #368