#104

Fixes #104 but the pull request is showing two previous commits that I know were already merged, so I'm not sure how to address this