Fixes #2

Merging a commit that fixes #2