Fixes #2
Fixes #8