Resolves #12
Fixes #11