Fixed queue() not handling tokens correctly
Small fix to the regex in queue()
Fixed indention
Merge pull request #72 from CrimsonVoid/1.2

Fixes #70