Fixes #9, Resolves #26