merge fbird's code
rename#243 metrics module, rename