Relaxed the definition of name tokens. Fixes issue #20