Merge pull request #1 from CoreOS-China/master

update