Merged development branch with improvements for 2D and 3D charts.