Fixes #2
Fixes #4