Fixes #11
Fixes #9