Fixes #9
Fixes #1