Changed hard coded filename string to library constant
Merge remote-tracking branch 'remotes/origin/master'
Added parameter so screen2 knos which screen to return to