Updated for Docker 0.9.0