OS X Fixes
Merge pull request #8 from DeVaukz/feature-graphics-system

OS X Fixes
Merge remote-tracking branch 'origin/feature-graphics-system' into develop