Made gl system-independent
Merge commit