Improved scanner code

All tokens are finalized
Merge pull request #2 from anjanettebriones/master

Improved scanner code