Merge

merging 1.0