In preparation for the next iteration of the tutorial, we need to bring in some changes. In particular some change in pull requests #35 and #36 were accidentally undone in preparing for the previous ...