Fixes #7
Fixes #7