added wait for completion
0.2.1