Merge pull request #176 from gsomlo/gls-ulong-addr