More work on charts system.
Bug fix.
Merge pull request #140 from mshamash/master

Finished charts system.