Merge pull request #581 from neheb/pri