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