implemented #50