Fix bug 14 - trailing spaces