Pull issue 43 merge

Manual merge of https://github.com/Netflix/RxJava/pull/196