Added support of the waitUntil() like Java and .NET client have