Fixes #3
Closes #2