Make sure wait()s work
Merge pull request #380 from Icenium/totev/waits

Make sure wait()s work