Fixes #4
Fixes #3