Merge branch 'fix_interspacing'