Merge pull request #659 from neheb/gsmm