Update to #137 - Replace wait_for_emulator script