Updated to d4-v0.4.0