Merge pull request #619 from neheb/qg