Resolves #14