More work on charts system...
Merge pull request #121 from mshamash/master

More work on charts system...