Mac OS X support
Merge pull request #1 from ghost91-/master

Mac OS X support
Merge branch 'master' into screens