Added scanner code to handle indentifiers
switching branches required update of master
preparing to merge vbranch to master and pull to tbranch
Merge remote-tracking branch 'origin/master' into tbranch