add check for tokens with spaces
merged all the 2.0 work
vanity
bug fix #94 - chanjo demo command fails.
add formating
Merge pull request #95 from kern3020/master

Bug fix #94