Merge pull request #31 from apache/awaitility

use awaitility library when possible