Updated to v0.17