Use standard OpenGL naming, now incompatible with glew
Windows fix: missing include
Merge pull request #16 from j-o/master

Windows fix: missing include
Merge branch 'master' into review_and_refinement