Fixes #7
Fixes #8