merged
Merge branch 'master' of github.com:QScience/d2d