Added more sensible word splitting