Merge 1.0.1