Merge pull request #24 from apache/BeneficiaryFix

Beneficiary fix