Updated to version v0.9.18