Merge pull request #153 from Urinophoria/master

New PAC OPD patches