Merge branch 'release/0.5'
Header
typo