Merge branch 'issue_5'

Fixes #5