Merge 1.0.4