Merge branch 'master' of https://github.com/birgerpersa/CGLS.git