fixes #19; fixes #20