tokeniser location assignment mismatch problem solved.
please test robustness though
Merge branch 'master' of https://github.com/MerrittJ/CourseworkWWJD.git