azonenberg Merge pull request #137 from rqou/gp4-fixes