Fixes #6
Fixes #7