Fixes #3
Fixes #8