fixes #11, this commit is going away when the PR is merged upstream