incorporated Daniels notes
Merge branch 'master' of https://github.com/HeinrichHartmann/D1-2