new scan code with mA and mcha2

Signed-off-by: BAllanach <B.C.Allanach@damtp.cam.ac.uk>
Merge branch 'master' into officialTag