Merge branch 'kh/tutorial-grammofix'