Updated to work with docker 0.8