merge 0.3.x (0.3.3)