Fixes #9
Fixes #7