Refactored code
Fixed metric plots
Merge pull request #137 from nmusienko/metric_plot

Fixed metric plots