Merge branch 'pr/39' into dev

Fixes #39