Updated for Docker 0.9.0
  Updated for Docker 0.9.0