committ1.0
Merge branch '1.0'