Fixes #5
Fixes #4