Cobertura support

Hi, David.

I clean my code, CR plz.


P.S. Sorry, I broke your indentation style.