Resolves #19