Updated to v.0.9.40