properly merged #20