minor improvements, use docker 1.0