Merge pull request #591 from neheb/p