Resolves #15