Merge branch 'Version-1.0'