Updated metrics documentation
Merged master