Merge pull request #1 from docker/master

update from master