handle trailing spaces on keywords
Merge pull request #49 from mtrubs/master

handle trailing spaces on keywords