Include d3 properly
Merge branch 'calculate'