Merge pull request #1 from skilau/master

Update to include new APIs for the Framework.
fixed highcharts sorting error