Fixes #7
Fixes #6