Merge 0.3.8 into my master