Fixes #4
Resolves #5