Updated with Screen6 stuff. Maybe I should go through this once more.
Merge pull request #1 from mishok13/screen6-update

Screen6 update