Fix for #39

We need to add location info (line/column) to Token as well before merging this in.