Merge glm to master