Merge branch 'hn/typofix'