Merg in 0.3.8