Resolves #17