Merge pull request #12 from mkpro118/fixup-scanner

Refactor scanner for a more context-rich token stream

Author: mkpro118