get a token's string safer
the end of a block's scope
Merge pull request #25 from elenasa/master

Catch up to upstream