some more math and test of workflow
Merge branch 'master' into gh-pages
updated notebook