Merge pull request #654 from neheb/g