Match Docker's refactoring
Merge pull request #1 from ncdc/master

Match Docker's refactoring