Updated to latest Rx 2.2.2