Merge pull request #1 from CoreOS-China/master

update
Merge pull request #11 from allengaller/master

Merge pull request #1 from CoreOS-China/master