Up'd wait time again
Merge pull request #531 from psav/live_free_or_wait_hard

Up'd wait time again