added check for the token
Merge branch 'master' of github.com:octoblu/meshblu