Neutralized race condition - The missing prompt problem should be fixed now!
Merge branch 'master' into deployment

Integrating the issue #6 hotfix into deployment