Resolves #20