Merge Ver 1.0