Updated to 0.9.0 v3