Updated to v0.41