Merge branch 'master' of github.com:RafiKueng/glass
bugfix for 64bit