Bug fixing and integration wit killbill 1.0.9