Fixes #9
Fixes #4