Merge 1.0.6