diff --git a/chart.js/chart.js-tests.ts b/chart.js/chart.js-tests.ts
new file mode 100644
index 0000000000..2b38efaa25
--- /dev/null
+++ b/chart.js/chart.js-tests.ts
@@ -0,0 +1,26 @@
+import { Chart, LinearChartData } from 'chart.js';
+
+//alternative:
+//import chartjs = require('chart.js');
+// => chartjs.Chart
+
+var chart = new Chart(new CanvasRenderingContext2D(), {
+    type: 'bar',
+    data: <LinearChartData> {
+        labels: ['group 1'],
+        datasets: [
+            {
+                label: 'test',
+                data: [1]
+            }
+        ]
+    },
+    options: {
+        scales: {
+            xAxes: [{
+                gridLines: { display: false }
+            }]
+        }
+    }
+});
+chart.update();
diff --git a/chart.js/index.d.ts b/chart.js/index.d.ts
index bf23a1cc52..83d596d439 100644
--- a/chart.js/index.d.ts
+++ b/chart.js/index.d.ts
@@ -3,411 +3,431 @@
 // Definitions by: Alberto Nuti <https://github.com/anuti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare enum ChartType {
-    line, bar, radar, doughnut, polarArea, bubble
-}
-declare enum TimeUnit {
-    millisecond, second, minute,
-    hour, day, week,
-    month, quarter, year
-}
-interface ChartLegendItem {
-    text?: string;
-    fillStyle?: string;
-    hidden?: boolean;
-    lineCap?: string;
-    lineDash?: number[];
-    lineDashOffset?: number;
-    lineJoin?: string;
-    lineWidth?: number;
-    strokeStyle?: string;
-}
-interface ChartTooltipItem {
-    xLabel?: string;
-    yLabel?: string;
-    datasetIndex?: number;
-    index?: number;
-}
-interface ChartTooltipCallback {
-    beforeTitle?: (item?: ChartTooltipItem[], data?: any) => void;
-    title?: (item?: ChartTooltipItem[], data?: any) => void;
-    afterTitle?: (item?: ChartTooltipItem[], data?: any) => void;
-    beforeBody?: (item?: ChartTooltipItem[], data?: any) => void;
-    beforeLabel?: (tooltipItem?: ChartTooltipItem, data?: any) => void;
-    label?: (tooltipItem?: ChartTooltipItem, data?: any) => void;
-    afterLabel?: (tooltipItem?: ChartTooltipItem, data?: any) => void;
-    afterBody?: (item?: ChartTooltipItem[], data?: any) => void;
-    beforeFooter?: (item?: ChartTooltipItem[], data?: any) => void;
-    footer?: (item?: ChartTooltipItem[], data?: any) => void;
-    afterfooter?: (item?: ChartTooltipItem[], data?: any) => void;
-}
-interface ChartAnimationParameter {
-    chartInstance?: any;
-    animationObject?: any;
-}
-interface ChartPoint {
-    x?: number;
-    y?: number;
-}
-
-interface ChartConfiguration {
-    type?: string;
-    data?: ChartData;
-    options?: ChartOptions;
-}
-
-interface ChartData {
-
-}
-
-interface LinearChartData extends ChartData {
-    labels?: string[];
-    datasets?: ChartDataSets[];
-}
-
-interface ChartOptions {
-    responsive?: boolean;
-    responsiveAnimationDuration?: number;
-    maintainAspectRatio?: boolean;
-    events?: string[];
-    onClick?: (any?: any) => any;
-    title?: ChartTitleOptions;
-    legend?: ChartLegendOptions;
-    tooltips?: ChartTooltipOptions;
-    hover?: ChartHoverOptions;
-    animation?: ChartAnimationOptions;
-    elements?: ChartElementsOptions;
-    scales?: ChartScales;
-}
-
-interface ChartFontOptions {
-    defaultFontColor?: ChartColor;
-    defaultFontFamily?: string;
-    defaultFontSize?: number;
-    defaultFontStyle?: string;
-}
-
-interface ChartTitleOptions {
-    display?: boolean;
-    position?: string;
-    fullWdith?: boolean;
-    fontSize?: number;
-    fontFamily?: string;
-    fontColor?: ChartColor;
-    fontStyle?: string;
-    padding?: number;
-    text?: string;
-}
-
-interface ChartLegendOptions {
-    display?: boolean;
-    position?: string;
-    fullWidth?: boolean;
-    onClick?: (event: any, legendItem: any) => void;
-    labels?: ChartLegendLabelOptions;
-}
-
-interface ChartLegendLabelOptions {
-    boxWidth?: number;
-    fontSize?: number;
-    fontStyle?: number;
-    fontColor?: ChartColor;
-    fontFamily?: string;
-    padding?: number;
-    generateLabels?: (chart: any) => any;
-}
-
-interface ChartTooltipOptions {
-    enabled?: boolean;
-    custom?: (a: any) => void;
-    mode?: string;
-    backgroundColor?: ChartColor;
-    titleFontFamily?: string;
-    titleFontSize?: number;
-    titleFontStyle?: string;
-    titleFontColor?: ChartColor;
-    titleSpacing?: number;
-    titleMarginBottom?: number;
-    bodyFontFamily?: string;
-    bodyFontSize?: number;
-    bodyFontStyle?: string;
-    bodyFontColor?: ChartColor;
-    bodySpacing?: number;
-    footerFontFamily?: string;
-    footerFontSize?: number;
-    footerFontStyle?: string;
-    footerFontColor?: ChartColor;
-    footerSpacing?: number;
-    footerMarginTop?: number;
-    xPadding?: number;
-    yPadding?: number;
-    caretSize?: number;
-    cornerRadius?: number;
-    multiKeyBackground?: string;
-    callbacks?: ChartTooltipCallback;
-}
-
-interface ChartHoverOptions {
-    mode?: string;
-    animationDuration?: number;
-    onHover?: (active: any) => void;
-}
-
-interface ChartAnimationObject {
-    currentStep?: number;
-    numSteps?: number;
-    easing?: string;
-    render?: (arg: any) => void;
-    onAnimationProgress?: (arg: any) => void;
-    onAnimationComplete?: (arg: any) => void;
-}
-
-interface ChartAnimationOptions {
-    duration?: number;
-    easing?: string;
-    onProgress?: (chart: any) => void;
-    onComplete?: (chart: any) => void;
-}
-
-interface ChartElementsOptions {
-    point?: ChartPointOptions;
-    line?: ChartLineOptions;
-    arc?: ChartArcOptions;
-    rectangle?: ChartRectangleOptions;
-}
-
-interface ChartArcOptions {
-    backgroundColor?: ChartColor;
-    borderColor?: ChartColor;
-    borderWidth?: number;
-}
-
-interface ChartLineOptions {
-    tension?: number;
-    backgroundColor?: ChartColor;
-    borderWidth?: number;
-    borderColor?: ChartColor;
-    borderCapStyle?: string;
-    borderDash?: any[];
-    borderDashOffset?: number;
-    borderJoinStyle?: string;
-}
-
-interface ChartPointOptions {
-    radius?: number;
-    pointStyle?: string;
-    backgroundColor?: ChartColor;
-    borderWidth?: number;
-    borderColor?: ChartColor;
-    hitRadius?: number;
-    hoverRadius?: number;
-    hoverBorderWidth?: number;
-}
-
-interface ChartRectangleOptions {
-    backgroundColor?: ChartColor;
-    borderWidth?: number;
-    borderColor?: ChartColor;
-    borderSkipped?: string;
-}
-interface GridLineOptions {
-    display?: boolean;
-    color?: ChartColor;
-    lineWidth?: number;
-    drawBorder?: boolean;
-    drawOnChartArea?: boolean;
-    drawticks?: boolean;
-    tickMarkLength?: number;
-    zeroLineWidth?: number;
-    zeroLineColor?: ChartColor;
-    offsetGridLines?: boolean;
-}
-
-interface ScaleTitleOptions {
-    display?: boolean;
-    labelString?: string;
-    fontColor?: ChartColor;
-    fontFamily?: string;
-    fontSize?: number;
-    fontStyle?: string;
-}
-
-interface TickOptions {
-    autoSkip?: boolean;
-    callback?: (value: any, index: any, values: any) => string;
-    display?: boolean;
-    fontColor?: ChartColor;
-    fontFamily?: string;
-    fontSize?: number;
-    fontStyle?: string;
-    labelOffset?: number;
-    maxRotation?: number;
-    minRotation?: number;
-    mirror?: boolean;
-    padding?: number;
-    reverse?: boolean;
-    min?: any;
-    max?: any;
-}
-interface AngleLineOptions {
-    display?: boolean;
-    color?: ChartColor;
-    lineWidth?: number;
-}
-
-interface PointLabelOptions {
-    callback?: (arg: any) => any;
-    fontColor?: ChartColor;
-    fontFamily?: string;
-    fontSize?: number;
-    fontStyle?: string;
-}
-
-interface TickOptions {
-    backdropColor?: ChartColor;
-    backdropPaddingX?: number;
-    backdropPaddingY?: number;
-    maxTicksLimit?: number;
-    showLabelBackdrop?: boolean;
-}
-interface LinearTickOptions extends TickOptions {
-    beginAtZero?: boolean;
-    min?: number;
-    max?: number;
-    maxTicksLimit?: number;
-    stepSize?: number;
-    suggestedMin?: number;
-    suggestedMax?: number;
-}
-
-interface LogarithmicTickOptions extends TickOptions {
-    min?: number;
-    max?: number;
-}
-
-type ChartColor = string | CanvasGradient | CanvasPattern;
-
-interface ChartDataSets {
-    backgroundColor?: ChartColor;
-    borderWidth?: number;
-    borderColor?: ChartColor;
-    borderCapStyle?: string;
-    borderDash?: number[];
-    borderDashOffset?: number;
-    borderJoinStyle?: string;
-    data?: number[] | ChartPoint[];
-    fill?: boolean;
-    label?: string;
-    lineTension?: number;
-    pointBorderColor?: ChartColor | ChartColor[];
-    pointBackgroundColor?: ChartColor | ChartColor[];
-    pointBorderWidth?: number | number[];
-    pointRadius?: number | number[];
-    pointHoverRadius?: number | number[];
-    pointHitRadius?: number | number[];
-    pointHoverBackgroundColor?: ChartColor | ChartColor[];
-    pointHoverBorderColor?: ChartColor | ChartColor[];
-    pointHoverBorderWidth?: number | number[];
-    pointStyle?: string | string[] | HTMLImageElement | HTMLImageElement[];
-    xAxisID?: string;
-    yAxisID?: string;
-}
-
-interface ChartScales {
-    type?: string;
-    display?: boolean;
-    position?: string;
-    beforeUpdate?: (scale?: any) => void;
-    beforeSetDimension?: (scale?: any) => void;
-    beforeDataLimits?: (scale?: any) => void;
-    beforeBuildTicks?: (scale?: any) => void;
-    beforeTickToLabelConversion?: (scale?: any) => void;
-    beforeCalculateTickRotation?: (scale?: any) => void;
-    beforeFit?: (scale?: any) => void;
-    afterUpdate?: (scale?: any) => void;
-    afterSetDimension?: (scale?: any) => void;
-    afterDataLimits?: (scale?: any) => void;
-    afterBuildTicks?: (scale?: any) => void;
-    afterTickToLabelConversion?: (scale?: any) => void;
-    afterCalculateTickRotation?: (scale?: any) => void;
-    afterFit?: (scale?: any) => void;
-    gridLines?: GridLineOptions;
-    scaleLabel?: ScaleTitleOptions;
-    ticks?: TickOptions;
-    xAxes?: ChartXAxe[];
-    yAxes?: ChartYAxe[];
-}
-
-interface ChartXAxe {
-    type?: string;
-    display?: boolean;
-    id?: string;
-    stacked?: boolean;
-    categoryPercentage?: number;
-    barPercentage?: number;
-    barThickness?: number;
-    gridLines?: GridLineOptions;
-    position?: string;
-    ticks?: TickOptions;
-    time?: TimeScale;
-    scaleLabel?: ScaleTitleOptions;
-}
-
-interface ChartYAxe {
-    type?: string;
-    display?: boolean;
-    id?: string;
-    stacked?: boolean;
-    position?: string;
-    ticks?: TickOptions;
-    scaleLabel?: ScaleTitleOptions;
-}
-
-interface LinearScale extends ChartScales {
-    ticks?: LinearTickOptions;
-}
-
-interface LogarithmicScale extends ChartScales {
-    ticks?: LogarithmicTickOptions;
-}
-
-interface TimeScale extends ChartScales {
-    format?: string;
-    displayFormats?: string;
-    isoWeekday?: boolean;
-    max?: string;
-    min?: string;
-    parser?: string | ((arg: any) => any);
-    round?: string;
-    tooltipFormat?: string;
-    unit?: string | TimeUnit;
-    unitStepSize?: number;
-}
-
-interface RadialLinearScale {
-    lineArc?: boolean;
-    angleLines?: AngleLineOptions;
-    pointLabels?: PointLabelOptions;
-    ticks?: TickOptions;
-}
-
 declare class Chart {
-    constructor (context: CanvasRenderingContext2D | HTMLCanvasElement, options: ChartConfiguration);
-    config: ChartConfiguration;
-    data: ChartData;
-    destroy: () => {};
-    update: (duration?: any, lazy?: any) => {};
-    render: (duration?: any, lazy?: any) => {};
-    stop: () => {};
-    resize: () => {};
-    clear: () => {};
-    toBase64: () => string;
-    generateLegend: () => {};
-    getElementAtEvent: (e: any) => {};
-    getElementsAtEvent: (e: any) => {}[];
-    getDatasetAtEvent: (e: any) => {}[];
+    public static readonly Chart: typeof Chart;
+        constructor(context: CanvasRenderingContext2D | HTMLCanvasElement, options: Chart.ChartConfiguration);
+        config: Chart.ChartConfiguration;
+        data: Chart.ChartData;
+        destroy: () => {};
+        update: (duration?: any, lazy?: any) => {};
+        render: (duration?: any, lazy?: any) => {};
+        stop: () => {};
+        resize: () => {};
+        clear: () => {};
+        toBase64: () => string;
+        generateLegend: () => {};
+        getElementAtEvent: (e: any) => {};
+        getElementsAtEvent: (e: any) => {}[];
+        getDatasetAtEvent: (e: any) => {}[];
 
-    defaults: {
-        global: ChartOptions;
+        defaults: {
+            global: Chart.ChartOptions;
+        }
+}
+
+declare namespace Chart {
+    export type ChartType = 'line' | 'bar' | 'radar' | 'doughnut' | 'polarArea' | 'bubble';
+
+    export type TimeUnit = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year';
+
+    export type ScaleType = 'category' | 'linear' | 'logarithmic' | 'time' | 'radialLinear';
+
+    export interface ChartLegendItem {
+        text?: string;
+        fillStyle?: string;
+        hidden?: boolean;
+        lineCap?: string;
+        lineDash?: number[];
+        lineDashOffset?: number;
+        lineJoin?: string;
+        lineWidth?: number;
+        strokeStyle?: string;
+    }
+
+    export interface ChartTooltipItem {
+        xLabel?: string;
+        yLabel?: string;
+        datasetIndex?: number;
+        index?: number;
+    }
+
+    export interface ChartTooltipCallback {
+        beforeTitle?: (item?: ChartTooltipItem[], data?: any) => void;
+        title?: (item?: ChartTooltipItem[], data?: any) => void;
+        afterTitle?: (item?: ChartTooltipItem[], data?: any) => void;
+        beforeBody?: (item?: ChartTooltipItem[], data?: any) => void;
+        beforeLabel?: (tooltipItem?: ChartTooltipItem, data?: any) => void;
+        label?: (tooltipItem?: ChartTooltipItem, data?: any) => void;
+        afterLabel?: (tooltipItem?: ChartTooltipItem, data?: any) => void;
+        afterBody?: (item?: ChartTooltipItem[], data?: any) => void;
+        beforeFooter?: (item?: ChartTooltipItem[], data?: any) => void;
+        footer?: (item?: ChartTooltipItem[], data?: any) => void;
+        afterfooter?: (item?: ChartTooltipItem[], data?: any) => void;
+    }
+
+    export interface ChartAnimationParameter {
+        chartInstance?: any;
+        animationObject?: any;
+    }
+
+    export interface ChartPoint {
+        x?: number;
+        y?: number;
+    }
+
+    export interface ChartConfiguration {
+        type?: ChartType | string;
+        data?: ChartData;
+        options?: ChartOptions;
+    }
+
+    export interface ChartData {
+
+    }
+
+    export interface LinearChartData extends ChartData {
+        labels?: string[];
+        datasets?: ChartDataSets[];
+    }
+
+    export interface ChartOptions {
+        responsive?: boolean;
+        responsiveAnimationDuration?: number;
+        maintainAspectRatio?: boolean;
+        events?: string[];
+        onClick?: (any?: any) => any;
+        title?: ChartTitleOptions;
+        legend?: ChartLegendOptions;
+        tooltips?: ChartTooltipOptions;
+        hover?: ChartHoverOptions;
+        animation?: ChartAnimationOptions;
+        elements?: ChartElementsOptions;
+        scales?: ChartScales;
+    }
+
+    export interface ChartFontOptions {
+        defaultFontColor?: ChartColor;
+        defaultFontFamily?: string;
+        defaultFontSize?: number;
+        defaultFontStyle?: string;
+    }
+
+    export interface ChartTitleOptions {
+        display?: boolean;
+        position?: string;
+        fullWdith?: boolean;
+        fontSize?: number;
+        fontFamily?: string;
+        fontColor?: ChartColor;
+        fontStyle?: string;
+        padding?: number;
+        text?: string;
+    }
+
+    export interface ChartLegendOptions {
+        display?: boolean;
+        position?: string;
+        fullWidth?: boolean;
+        onClick?: (event: any, legendItem: any) => void;
+        labels?: ChartLegendLabelOptions;
+    }
+
+    export interface ChartLegendLabelOptions {
+        boxWidth?: number;
+        fontSize?: number;
+        fontStyle?: number;
+        fontColor?: ChartColor;
+        fontFamily?: string;
+        padding?: number;
+        generateLabels?: (chart: any) => any;
+    }
+
+    export interface ChartTooltipOptions {
+        enabled?: boolean;
+        custom?: (a: any) => void;
+        mode?: string;
+        backgroundColor?: ChartColor;
+        titleFontFamily?: string;
+        titleFontSize?: number;
+        titleFontStyle?: string;
+        titleFontColor?: ChartColor;
+        titleSpacing?: number;
+        titleMarginBottom?: number;
+        bodyFontFamily?: string;
+        bodyFontSize?: number;
+        bodyFontStyle?: string;
+        bodyFontColor?: ChartColor;
+        bodySpacing?: number;
+        footerFontFamily?: string;
+        footerFontSize?: number;
+        footerFontStyle?: string;
+        footerFontColor?: ChartColor;
+        footerSpacing?: number;
+        footerMarginTop?: number;
+        xPadding?: number;
+        yPadding?: number;
+        caretSize?: number;
+        cornerRadius?: number;
+        multiKeyBackground?: string;
+        callbacks?: ChartTooltipCallback;
+    }
+
+    export interface ChartHoverOptions {
+        mode?: string;
+        animationDuration?: number;
+        onHover?: (active: any) => void;
+    }
+
+    export interface ChartAnimationObject {
+        currentStep?: number;
+        numSteps?: number;
+        easing?: string;
+        render?: (arg: any) => void;
+        onAnimationProgress?: (arg: any) => void;
+        onAnimationComplete?: (arg: any) => void;
+    }
+
+    export interface ChartAnimationOptions {
+        duration?: number;
+        easing?: string;
+        onProgress?: (chart: any) => void;
+        onComplete?: (chart: any) => void;
+    }
+
+    export interface ChartElementsOptions {
+        point?: ChartPointOptions;
+        line?: ChartLineOptions;
+        arc?: ChartArcOptions;
+        rectangle?: ChartRectangleOptions;
+    }
+
+    export interface ChartArcOptions {
+        backgroundColor?: ChartColor;
+        borderColor?: ChartColor;
+        borderWidth?: number;
+    }
+
+    export interface ChartLineOptions {
+        tension?: number;
+        backgroundColor?: ChartColor;
+        borderWidth?: number;
+        borderColor?: ChartColor;
+        borderCapStyle?: string;
+        borderDash?: any[];
+        borderDashOffset?: number;
+        borderJoinStyle?: string;
+    }
+
+    export interface ChartPointOptions {
+        radius?: number;
+        pointStyle?: string;
+        backgroundColor?: ChartColor;
+        borderWidth?: number;
+        borderColor?: ChartColor;
+        hitRadius?: number;
+        hoverRadius?: number;
+        hoverBorderWidth?: number;
+    }
+
+    export interface ChartRectangleOptions {
+        backgroundColor?: ChartColor;
+        borderWidth?: number;
+        borderColor?: ChartColor;
+        borderSkipped?: string;
+    }
+    export interface GridLineOptions {
+        display?: boolean;
+        color?: ChartColor;
+        lineWidth?: number;
+        drawBorder?: boolean;
+        drawOnChartArea?: boolean;
+        drawticks?: boolean;
+        tickMarkLength?: number;
+        zeroLineWidth?: number;
+        zeroLineColor?: ChartColor;
+        offsetGridLines?: boolean;
+    }
+
+    export interface ScaleTitleOptions {
+        display?: boolean;
+        labelString?: string;
+        fontColor?: ChartColor;
+        fontFamily?: string;
+        fontSize?: number;
+        fontStyle?: string;
+    }
+
+    export interface TickOptions {
+        autoSkip?: boolean;
+        callback?: (value: any, index: any, values: any) => string;
+        display?: boolean;
+        fontColor?: ChartColor;
+        fontFamily?: string;
+        fontSize?: number;
+        fontStyle?: string;
+        labelOffset?: number;
+        maxRotation?: number;
+        minRotation?: number;
+        mirror?: boolean;
+        padding?: number;
+        reverse?: boolean;
+        min?: any;
+        max?: any;
+    }
+    export interface AngleLineOptions {
+        display?: boolean;
+        color?: ChartColor;
+        lineWidth?: number;
+    }
+
+    export interface PointLabelOptions {
+        callback?: (arg: any) => any;
+        fontColor?: ChartColor;
+        fontFamily?: string;
+        fontSize?: number;
+        fontStyle?: string;
+    }
+
+    export interface TickOptions {
+        backdropColor?: ChartColor;
+        backdropPaddingX?: number;
+        backdropPaddingY?: number;
+        maxTicksLimit?: number;
+        showLabelBackdrop?: boolean;
+    }
+    export interface LinearTickOptions extends TickOptions {
+        beginAtZero?: boolean;
+        min?: number;
+        max?: number;
+        maxTicksLimit?: number;
+        stepSize?: number;
+        suggestedMin?: number;
+        suggestedMax?: number;
+    }
+
+    export interface LogarithmicTickOptions extends TickOptions {
+        min?: number;
+        max?: number;
+    }
+
+    type ChartColor = string | CanvasGradient | CanvasPattern;
+
+    export interface ChartDataSets {
+        backgroundColor?: ChartColor;
+        borderWidth?: number;
+        borderColor?: ChartColor;
+        borderCapStyle?: string;
+        borderDash?: number[];
+        borderDashOffset?: number;
+        borderJoinStyle?: string;
+        data?: number[] | ChartPoint[];
+        fill?: boolean;
+        label?: string;
+        lineTension?: number;
+        pointBorderColor?: ChartColor | ChartColor[];
+        pointBackgroundColor?: ChartColor | ChartColor[];
+        pointBorderWidth?: number | number[];
+        pointRadius?: number | number[];
+        pointHoverRadius?: number | number[];
+        pointHitRadius?: number | number[];
+        pointHoverBackgroundColor?: ChartColor | ChartColor[];
+        pointHoverBorderColor?: ChartColor | ChartColor[];
+        pointHoverBorderWidth?: number | number[];
+        pointStyle?: string | string[] | HTMLImageElement | HTMLImageElement[];
+        xAxisID?: string;
+        yAxisID?: string;
+    }
+
+    export interface ChartScales {
+        type?: ScaleType | string;
+        display?: boolean;
+        position?: string;
+        beforeUpdate?: (scale?: any) => void;
+        beforeSetDimension?: (scale?: any) => void;
+        beforeDataLimits?: (scale?: any) => void;
+        beforeBuildTicks?: (scale?: any) => void;
+        beforeTickToLabelConversion?: (scale?: any) => void;
+        beforeCalculateTickRotation?: (scale?: any) => void;
+        beforeFit?: (scale?: any) => void;
+        afterUpdate?: (scale?: any) => void;
+        afterSetDimension?: (scale?: any) => void;
+        afterDataLimits?: (scale?: any) => void;
+        afterBuildTicks?: (scale?: any) => void;
+        afterTickToLabelConversion?: (scale?: any) => void;
+        afterCalculateTickRotation?: (scale?: any) => void;
+        afterFit?: (scale?: any) => void;
+        gridLines?: GridLineOptions;
+        scaleLabel?: ScaleTitleOptions;
+        ticks?: TickOptions;
+        xAxes?: ChartXAxe[];
+        yAxes?: ChartYAxe[];
+    }
+
+    export interface ChartXAxe {
+        type?: ScaleType | string;
+        display?: boolean;
+        id?: string;
+        stacked?: boolean;
+        categoryPercentage?: number;
+        barPercentage?: number;
+        barThickness?: number;
+        gridLines?: GridLineOptions;
+        position?: string;
+        ticks?: TickOptions;
+        time?: TimeScale;
+        scaleLabel?: ScaleTitleOptions;
+    }
+
+    export interface ChartYAxe {
+        type?: ScaleType | string;
+        display?: boolean;
+        id?: string;
+        stacked?: boolean;
+        position?: string;
+        ticks?: TickOptions;
+        scaleLabel?: ScaleTitleOptions;
+    }
+
+    export interface LinearScale extends ChartScales {
+        ticks?: LinearTickOptions;
+    }
+
+    export interface LogarithmicScale extends ChartScales {
+        ticks?: LogarithmicTickOptions;
+    }
+
+    export interface TimeDisplayFormat {
+        millisecond?: string;
+        second?: string;
+        minute?: string;
+        hour?: string;
+        day?: string;
+        week?: string;
+        month?: string;
+        quarter?: string;
+        year?: string;
+    }
+
+    export interface TimeScale extends ChartScales {
+        format?: string;
+        displayFormats?: TimeDisplayFormat;
+        isoWeekday?: boolean;
+        max?: string;
+        min?: string;
+        parser?: string | ((arg: any) => any);
+        round?: string;
+        tooltipFormat?: string;
+        unit?: TimeUnit;
+        unitStepSize?: number;
+    }
+
+    export interface RadialLinearScale {
+        lineArc?: boolean;
+        angleLines?: AngleLineOptions;
+        pointLabels?: PointLabelOptions;
+        ticks?: TickOptions;
     }
 }
+
+export = Chart;
+export as namespace Chart;
\ No newline at end of file
diff --git a/chart.js/tsconfig.json b/chart.js/tsconfig.json
index 79b9eb6b27..684beee72d 100644
--- a/chart.js/tsconfig.json
+++ b/chart.js/tsconfig.json
@@ -13,6 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "index.d.ts"
+        "index.d.ts",
+        "chart.js-tests.ts"
     ]
 }
\ No newline at end of file