Switched function used to get screen width since it was not available on Windows.
Updating.

Merge remote-tracking branch 'origin/master'