Updated for Docker 1.0.0