Added support for columns and lines in Tokens
Merge branch 'master' into issue22
Merge pull request #24 from HippoPHP/issue22

Added support for columns and lines in Tokens (issue #22)