Merge pull request #87 from kern3020/master

fix syntax error
add check for tokens with spaces