Fixes #4
Fixes #1