Basic chart support
Chart improvements
Merge branch 'develop' into chart
#278: Basic chart
Merge branch 'chart' into develop