merged glut_osx branch into master