#133 removed by issue with ruby 2.0
Merge branch 'master' into feature/host-and-protocol-support