Fixes #5
Fixes #1