Merge branch 'jc/typo'