Update PGM with recent changes
Merge pull request #532 from hurtonm/pgm_build_fix

Update PGM with recent changes