Merge pull request #57 from Pilot-Pirx/Pilot-Pirx-patch-1