Merge branch 'chris' of https://github.com/Gregzenegair/tppariscope.git into Gregzenegair