updating
Merge branch 'master' into branchOpenGL