Removing irrelevant bugs code
Porting to Scala 2.11
Doc fix