ZSS-697 Enhance the Chart engine
Merge pull request #63 from jerrywell/zss697

ZSS-697 Enhance the Chart engine