Basic OpenGL framework
Merge origin/master