Updated default wait
Updated to latest RxScala