Integrated makeglifs into master branch