Merge pull request #507 from Icenium/vladimirov/fix-remote-emulator

Add correct waits in dispatcher
Merge pull request #509 from Icenium/vladimirov/fix-error-in-dispatcher

Fix missing () in dispatcher