Add token check
Merge branch 'master' of github.com:pacbard/clsipy