Fixes #6
Fixes #1