GSoC2014 OHamm metrics extra2

The other pull was done the wrong way.