Added async wait helper
minor api changes
Merge commit 'e6c95355185c1494a03859ec3ca68db324dbb66f'