fix #10: allow keywords containing a '+' character