Fixes #13

Review by @gzm0