merge 0.3.8 -> master