master meging with #20 fixes