Updated to version v0.18