Opengl dev

Merge to master branch