Merge 0.3.5 into my master branch