Testing a commit from an other branch
Merge remote-tracking branch 'jia/master' into jia
minor cosmetic fixes to screen.py
Merge pull request #1 from JeromeLefebvre/jia

Made minor changes to the file