Merge 1.0.4 into master