Fixes #7
Fixes #9