protecteding against non-xwindows environments
Merge remote-tracking branch 'origin/master'