fixed d3
Merge branch 'master' into final-changes-11-13
Merge pull request #78 from elyotli/final-changes-11-13

Final changes 11 13