Fixes #1
Merge branch 'pr/2'
Fixes #3 as well.

Can’t believe I missed this PR. Sorry.