Fixes #6
Fixes #8