Mass-scan now also working for both models
Merge branch 'master' of https://github.com/CINF/PyExpLabSys