Merge pull request #686 from Tendrid/develop

move chart draw
zingermans revamp