tmp
Merge origin/master
Re-factored formatChartService
Re-factored formatChartService