License header updated, switch to RxJava base