Merge branch 'tk/stripspace'