Implemented barcharts
Merge branch 'master' into barchart
Fix duplicated modules