Repaired getting of token
Checking if token is array
Merge pull request #30 from nenadalm/master

Repaired getting of token