Merge pull request #980 from mc-ducky/add-beam-to-token-list

Merge pull request #980 from mc-ducky/add-beam-to-token-list #398