Merge branch 'master' into gh-pages
better d3 handling
Merge branch 'gh-pages'