Merge pull request #2 from CoreOS-China/master

update
Merge pull request #19 from allengaller/master

Merge pull request #2 from CoreOS-China/master