quick update. more on this later.
Merge branch 'master' of https://github.com/roblarsen/CanvasJS.git