Fixed small error. REOL-79
Added switch for allowing the user to wait. REOL-79