Thank you, Robert. Your changes look reasonable. So, from wokrflow point  of view, should I apply you patch on top of my tutorial-FEM-notes branch in my forked repository and reapply the pull request?