Only wait for a keypress if the user is told to press a key.
Merge pull request #747 from oliverschmidt/master

Only wait for a keypress if the user is told to press a key.